Repository navigation
refactor(apps): canonicalize CLI and retire root entries (A1) - #461
Conversation
Refs #408 Agent-assisted-by: Claude Code / claude-fable-5-2 [effort=max] (author) Signed-off-by: GUOGUO <xwdong1998@163.com>
Signed-off-by: GUOGUO <xwdong1998@163.com>
|
@amy-why-3459 @zengchuang-hw Please review A1, tracked by Issue408, at head |
zengchuang-hw
left a comment
There was a problem hiding this comment.
PR review verdict — DO NOT PASS (verification remains incomplete; no code defect found in this review)
First independent review of A1 for #408. Reviewed base f536288 -> head 18f189a. Previous review: none. Request: #461 (comment). I reviewed the actual code and governing Issue, not other reviewers' opinions.
Architecture assessment:
- The canonical apps.cli package and parser replace both root modules, without forwarders or registry aliases. Runtime CLI normalized AST is equivalent after resolving moved imports and accounting for import-order changes.
- REPO_TYPES is read through the existing Knowledge catalog binding, not copied; the neutral leaf's bytes are unchanged. Removing the temporary importer, preserving its exact historical record and keeping the permanent Infra rule is consistent with A1.
- The root main exception is restricted to the exact plain module-level import of main from apps.cli; negative fixtures still reject wider shapes/targets. Root inventory is exactly eight. Independently evaluated first_wave_report has no violations but still lists 12 Harness-to-Infra hits and five resource loaders. This is not complete isolation.
Executed locally at this head (Linux/Python 3.12, isolated checkout):
- Six gate/manifest/root/facade/frozen-legacy modules: 151 passed, 274 subtests passed.
- Apps assessment/CLI plus Codex, DSH and WorkSwarm plugin modules: 118 passed, 2 subtests passed, including external-workspace DSH bundle execution.
- ruff check src tests: passed.
- Nine real python-module command comparisons against base: identical exit code/stdout/stderr (help/version/skills help/benchmark list/fixed-record error paths/invalid option).
- Active-consumer search found no old root CLI/parser imports outside intentional tests/history.
The initial mixed test run had one subprocess import failure with a relative PYTHONPATH; rerunning with the absolute candidate source path passed. No product/test edits were used.
Before approval:
- Complete the current-head full-check jobs for Python 3.10 and 3.11. Both are still in progress; focused checks cannot replace the full suite.
- Obtain a successful pr-references rerun. The failed job rejected the negated closing phrase in the original body. The current body no longer matches that syntax, but the recorded check remains failed: https://github.com/InferMatrixLab/InferRSI/actions/runs/43812153335/job/133115992805.
- Close the host-matrix evidence gap required by #408: the reported Windows run remains 63 passed / 8 failed. Linux success does not establish Windows behavior. Supply a successful Windows rerun of affected cases or concrete same-host baseline/candidate evidence isolating an unchanged environmental failure. I did not execute Windows/macOS checks.
Observed remote evidence: installed-package 3.10/3.11, dashboard-browser, lint-and-smoke and declaration checks are successful. I did not independently repeat the full installed-resource checker or real sdist-to-wheel build; those remote successes and author receipts are distinct from my local tests. Full local suite not run. No non-blocking suggestions. No merge/auto-merge performed.
|
Reviewed base The A1 move itself looks consistent with the accepted scope: Outstanding blockers:
|
Track all13 retired roots without weakening core isolation assertions. Preserve R1 eleven plus the two exact A1 retired paths and all original subprocess isolation checks. Windows host evidence remains a separate open review item. Refs #408 Agent-assisted-by: Claude Code / claude-fable-5-2 [effort=max] (author) Signed-off-by: GUOGUO <xwdong1998@163.com>
|
@amy-why-3459 @zengchuang-hw Follow-up to Amy's comment and review5915579655, both assessed at The single full-check failure is repaired: the test now pins R1's historical eleven plus the exact two A1 retired names, their disjoint union and total thirteen. Its original subprocess isolation script, negative assertions and deadlines are unchanged. The original Fable session authored the fix; independent H200 CPU validation passed the whole affected module (20 passed in 6.26s), changed-file Ruff and the real installed925-resource checker. No application/package/CI-policy changes or timeout increases. The fresh pr-references check is green on the corrected current body. New-head installed-package checks for Python3.10/3.11, declarations and lint-and-smoke are also green. The two full-check jobs and dashboard-browser are still running in the current CI run; their final results are not yet claimed. The Windows host-evidence item remains OPEN: the original 63-pass/8-fail run is preserved, and Linux/H200 success is not presented as Windows proof. No new Windows/macOS run or hosted job is claimed. Please recheck the precise test repair and current-head CI; this is not a claim that all review blockers or architecture approval are complete. |
zengchuang-hw
left a comment
There was a problem hiding this comment.
Incremental review: INCONCLUSIVE, not approved.
Range: 18f189a -> 7fd5bb1.
Previous review: #461 (review)
I inspected the entire one-file incremental diff and surrounding isolation subprocess. The update correctly pins the eleven R1 retired modules plus the exact two A1 names, asserts disjointness and union equality, and checks all thirteen names remain unloaded. The subprocess still imports every Harness records module and rejects Knowledge/Apps/Benchmark imports; no isolation check is weakened. No product code changed in this range.
Executed at this exact head in an isolated Linux/Python 3.12 checkout: all 20 tests in tests/test_campaign_record_injection.py passed; Ruff on that file passed. No test/product edits were made for verification. The previous broader test evidence is historical, not a fresh full-suite result for this head.
Resolved: the outdated retired-root count is corrected and the affected module passes locally. The current-head pr-references check is now successful.
Before approval: current-head full-check 3.10/3.11 and dashboard-browser were still in progress at verification; obtain their completed successful results. The previously documented Windows 63-pass/8-fail host-matrix gap remains unclosed in the available author evidence. A successful affected-case Windows rerun, or same-host immutable-baseline/candidate evidence showing an unchanged environmental failure, is still needed. Linux results cannot close this gap.
Observed remote successes: installed-package 3.10/3.11, pr-references, lint-and-smoke, and a declaration check. I did not rerun the entire local suite, Windows/macOS, the installed-resource checker, or a real sdist-to-wheel build this round. No new code defect or non-blocking suggestion found in this incremental diff. No merge or auto-merge.
|
PR review verdict — DO NOT PASS Reviewed range The incremental diff is the one-file test repair in Resolved from my previous comment (#461 (comment)):
Installed-package 3.10/3.11, lint-and-smoke, declarations, and dashboard-browser are also green on this head. Outstanding blocker (unchanged):
I did not rerun the suite locally. Accuracy and performance comparison experiments are still not applicable (test-pin and entrypoint relocation). |
There was a problem hiding this comment.
PR review verdict — DO NOT PASS
Reviewed base f536288710c726a827bfa3e4357c2c911984cbc3 and head 7fd5bb1fe388c9046b9053acf61c5d393c0c2cd9. Refs #408 A1. Independent review via cursor[bot]; not the author account.
A1 code itself matches the accepted slice: inferrsi.apps.cli:main is the console entry, root __main__.py is only from .apps.cli import main, root cli.py/arguments.py are gone with no forwarders or sys.modules aliases, APPLICATION_ENTRIES drops the CLI files and keeps benchmark_operations.py for A2, the temporary leaf-importer exception is removed (REPO_TYPES via inferrsi.knowledge.catalog), and the root inventory pin is 10→8 with thirteen retired roots (R1 eleven ∪ A1 two).
Verified locally on this head (Linux): focused gate/CLI modules 218 passed, 276 subtests; ruff clean on changed A1 leaves; python -m inferrsi --help exits 0; retired inferrsi.cli/inferrsi.arguments raise ModuleNotFoundError; first_wave_report has zero new violations and still reports isolation_complete=False with the expected Harness→Infra / resource-loader blockers (not weakened). Hosted CI on this head is green: full-check 3.10/3.11, installed-package 3.10/3.11, lint-and-smoke, pr-references, declarations, dashboard-browser.
Prior blockers that are resolved on this head:
tests/test_campaign_record_injection.pynow pins R1 eleven + A1 two, disjointness, union, and unloaded thirteen.pr-referencesand both full-check jobs succeed on7fd5bb1fe.
Outstanding blocker (required evidence still insufficient):
- #408 acceptance requires preserving command behavior on the existing host matrix. Author evidence still records Windows 63 passed / 8 failed (seven 45s isolated-subprocess timeouts; one DSH empty-output parse), states Windows is not green, and provides no successful Windows rerun of the affected cases and no same-host immutable-baseline vs candidate comparison that isolates an unchanged environmental failure for those seven timeouts. Linux/H200 success and hosted Linux CI do not close that gap. I did not execute Windows/macOS checks in this environment.
Before re-review / Approve: supply a successful Windows rerun of the affected cases, or same-host baseline vs candidate evidence isolating an unchanged environmental failure. No merge performed.
Signed-off-by: GUOGUO <xwdong1998@163.com>
…d runners Add a host-compatibility job to the ready lane. It runs on windows-latest and macos-latest, one host at a time, and executes only the eight plugin and DSH nodes from the recorded Windows run (63 passed, 8 failed), then builds a wheel from the sdist and checks it in a fresh venv outside the checkout. Existing jobs, triggers and test deadlines are unchanged. Refs #408 Agent-assisted-by: Claude Code / claude-fable-5-2 [effort=max] (author) Signed-off-by: GUOGUO <xwdong1998@163.com>
Signed-off-by: GUOGUO <xwdong1998@163.com>
|
Windows evidence for the eight affected nodes, current head Same-host comparison on the original Windows machine (Windows 11, Python 3.13.5, pytest 9.0.2, Node 24.14.0). I ran the same eight nodes with the original arguments (
Unchanged Hosted runners. This head adds a |
|
Hosted CI result for head
This is the successful Windows rerun of the affected cases requested in this comment and this review. All eight nodes pass on a hosted Windows runner with their existing 45 s deadlines. The original 63 passed / 8 failed record and the local same-host comparison above remain as history. The wheel version is Architecture approval is still pending. |
amy-why-3459
left a comment
There was a problem hiding this comment.
LGTM
PR review verdict — PASS
Reviewed range 7fd5bb1fe388c9046b9053acf61c5d393c0c2cd9..cb59d3aa135d803d8dfba84d7bbd94a918551bc8 (base 016c7c7df023944f0f46d8e777d6d31f1df1764c, head cb59d3aa135d803d8dfba84d7bbd94a918551bc8). Refs #408 A1.
The outstanding host-matrix blocker from #461 (comment) is resolved:
- Same-host comparison on the original Windows machine (#461 (comment)): unchanged main
a1093578c725eb7dc34a2bfbbd4fefab5abbc098and A1ddbbb2539305e72ccb8250c606a9e68370bf910dproduced the same 5 passed / 3 failed result; the three remaining failures are the same 45 s isolated-plugin timeouts on both sides. - Hosted
host-compatibilityon this head is green: windows-latest and macos-latest both passed the eight affected nodes plus the sdist-to-wheel install and console/module entry checks. This is the successful Windows rerun of the affected cases.
The unique product/test delta versus current main is still the previously reviewed A1 move and the thirteen-root isolation pin. The new commit 960082badc9e0554d12b1563637fb0755dad0f83 only adds the host-compatibility job in .github/workflows/ci-ready.yml. Ready-lane checks on this head are green, including full-check 3.10/3.11, installed-package 3.10/3.11, lint-and-smoke, pr-references, declarations, and dashboard-browser: https://github.com/InferMatrixLab/InferRSI/actions/runs/43837681649
Non-blocking: the new job is now a standing ready-lane check for later PRs, not only this A1 evidence run. That looks reasonable as ongoing host-matrix coverage; please confirm it is intended as permanent policy.
Accuracy and performance comparison experiments are not applicable (entrypoint relocation and CI evidence; command behavior is meant to stay the same). I did not rerun the suite locally.
zengchuang-hw
left a comment
There was a problem hiding this comment.
A1 incremental review: APPROVE at cb59d3a.
Range reviewed: 7fd5bb1 -> cb59d3a. Previous review: #461 (review). This follows my earlier actual-code architecture review and retired-root guard verification.
I inspected the new host-compatibility workflow and merge integration. The job has read-only contents permission, does not persist checkout credentials, serializes the two hosted OS jobs, requires every one of the eight selected nodes to run with zero skips/errors/failures, and uses unchanged test deadlines. The fresh wheel environment removes PYTHONPATH, verifies site-packages origin, runs the installed checker under -I, and compares console/module outputs. It is bounded host evidence, not a full Windows/macOS suite or performance qualification.
The incoming main API/catalog/knowledge changes are byte-identical to main 016c7c7. The Apps assessment test retains the A1 canonical CLI import, and installed inventory includes main's two new resources (927). No old CLI forwarder was reintroduced.
Executed locally at this exact head, isolated Linux/Python 3.12 checkout: 168 tests and 274 subtests passed across campaign record injection, Apps assessment, target-module gate, first-wave isolation, package-root inventory and source snapshot modules; ruff check src tests tools passed. No product or test edits were made.
I independently read the hosted job logs, rather than accepting the author summary:
- Windows: eight affected nodes passed in 53.20s, JUnit 8 tests / 0 errors / 0 failures / 0 skipped; real sdist-to-wheel build and fresh installed checker succeeded.
- macOS: eight nodes passed in 20.10s, likewise zero skipped/errors/failures, with the same installed-wheel checks.
- Both installed inventories report 927 resources with matching digest. Console/module version and benchmark-list checks completed successfully.
- Full-check 3.10 and 3.11 each report 4,665 passed, 27 skipped and 616 subtests passed. Current-head pr-references, dashboard-browser, installed-package and lint/declaration checks are successful.
Hosted checkout was synthetic merge e50f441. I verified its tree ee1449978dc7abfc2bacc8517581d9ef7d6d784f equals this exact head's tree, so this is relevant current-head evidence, not an unrelated revision. The shallow-checkout wheel version is not a separate product revision claim.
Resolved since my previous review: full CI completed successfully; pr-references remains green; the successful real Windows rerun closes the eight-case host evidence gap. The original 63-pass/8-fail history remains history, not rewritten. I find no remaining blocking issue in the reviewed A1 scope. Architecture approval here is for the bounded CLI/parser retirement and exact guards, not A2/M1/R2/R3 or complete core isolation.
Not executed locally this round: full suite, Windows/macOS jobs, separate wheel build, or performance experiments. Hosted checks above were inspected, not rerun by me. No non-blocking suggestions. No merge or auto-merge performed.
Scope
Refs #408
A1 only, following merged C1/C2/R1. This is one slice of the open Apps/architecture issues; A2/M1/R2/R3 are not implemented.
inferrsi.apps.cli:mainthe canonical CLI, with arguments ininferrsi.apps.cli.arguments; route package__main__directly to that canonical entry.cli.pyandarguments.py, without permanent forwarding shells orsys.modulesaliases. Retire the R1 temporary arguments-import exception and update active consumers, tools, plugins, tests, migration documentation and the exact manifest/root-inventory guard (10 → 8).__main__ → apps.climain seam is allowed. Preserve the assertion that a clean scan does not imply core isolation, and preserve negative fixtures. This PR does not claim full isolation or relax broad banned prefixes.Main integration and provenance
Initial implementation baseline:
aaa17a5dd333449d15fb052bb09b2012d55f2327.Normal signed-off checkpoint
41491c966b2606a0f4cefc48eb703b9649fa0d2e, followed by ordinary merge ofmainf536288710c726a827bfa3e4357c2c911984cbc3(#351), producing18f189a8873da75b4fbcae2910711b2a37a8bbf3. No rebase, amend, force push or skipped hooks. All nine incoming main paths were preserved; the installed checker retains A1 import changes plus main's precise resource count 925.All substantive A1 source, tests and documentation were authored in the original Claude Code session using the requested/reported
claude-fable-5-2, effortmax. This is client/session attribution, not a backend attestation. The coordinator performed independent review/acceptance, mechanical Git/snapshot/build operations and this PR metadata, not substantive product drafting. Manifest relocking and precision-guard changes still require formal architecture review; passing tests is not that approval.Independent acceptance — initial implementation head
18f189a88Evidence is retained in the T381 execution records and the owned CPU-only H200 isolation directory. No GPU, training or other users' services were used. Heavy tests/builds now run on H200, serially.
harness/run_store.pyF811 baseline remains outside this PR).tests/test_skill_coverage_view.pymodule passed (exit 0, 28.511s).Real distribution / installed-entry acceptance on the merged head
skillsPyYAML extra needed by the checker. No Windows venv was copied. Core metadata declares no runtime dependencies.0.1.11.dev22+g18f189a88, obtained first from the actual clean native Git checkout. The verified source archive uses the documented setuptools-scm pretend-version input for the sdist only; wheel metadata comes from the sdist PKG-INFO.8a59aef44a44385ae050d555b64ee33456622cdd2970ac42d618719b5637fd99.__main__, 13 retired import failures/no old CLI aliases, REPO_TYPES identity, all seven pack bytes and package version checks passed.python -m inferrsi --helpboth exited 0 outside the checkout. An extra coordinator harness assertion initially and incorrectly required raw console/module help to be identical. That failed receipt is preserved. Argparse normally rendersinferrsivs__main__.pyusage labels/wrapping; each complete captured output was then independently matched byte-for-byte to the unchanged installed parser with its own actual program name. No product/test/guard/timeout changes or rebuilds were used to hide the harness error.cafce2876be0877bf4b0e8b4dee441dfce2bda9545bf244b9e5abb69e1ac986b.b0c77fc9bd34d5354d17bce306acad49ffc357a67d3fe0d5cceda5d7fd450a2d.6872b5931ec93f802d3b55e4989fdd9b4d878c00eb4d73c7bfd439c1ba8602e5.Full Linux/Python CI and independent architecture reviews remain required; no automatic merge or issue closure is requested. Existing old408 dirty worktree/evidence branches were not modified. Per the owner's handoff instruction, this workflow stops after this A1 PR closes; later queue work is not started here.
Review follow-up — head
7fd5bb1fe388c9046b9053acf61c5d393c0c2cd9Follow-up to review5915579655, which assessed
18f189a8873da75b4fbcae2910711b2a37a8bbf3.tests/test_campaign_record_injection.py::test_harness_records_load_no_knowledge_or_apps_module: a stale expectation of eleven retired roots despite the legitimate A1 total of thirteen. Each run also reported 4,657 passed, 27 skipped, 616 subtests passed; those initial failures are retained, not relabeled as success.18f189a88wheel. All package, resource, pyproject and checker bytes are unchanged; no new-head wheel build is falsely claimed. New GitHub installed-package jobs will build their own new-head distributions.294b9a744e1bc3efeee2cb3db5a089012165c395ed42ef5e9f75e21d29e9af36, all unchanged after acceptance. The earlier sdist/wheel hashes and version below describe the initial implementation distribution, not a rebuilt fix-head artifact.18f189a88; latest main remainsf536288710c726a827bfa3e4357c2c911984cbc3. A real fast-forward push triggers fresh CI using the corrected standaloneRefsbody, rather than manufacturing a green check from the old failing PR-reference event.Follow-up — current head
cb59d3aa135d803d8dfba84d7bbd94a918551bc8960082badc9e0554d12b1563637fb0755dad0f83adds onehost-compatibilityjob to.github/workflows/ci-ready.yml. Onwindows-latestandmacos-latest, one host at a time, it runs only the eight nodes from the recorded Windows run, then builds a wheel from the sdist, installs it with[skills]into a fresh venv outside the checkout, runs the unchangedtests/check_installed.pywith-I, and compares the console script withpython -I -m inferrsi. The original Claude Code session (claude-fable-5-2, effortmax) authored the job; replaying its single recorded Edit on the parent reproduces the committed file byte for byte. No existing job, trigger, assertion or test deadline changed.cb59d3aa135d803d8dfba84d7bbd94a918551bc8is an ordinary signed-off merge ofmain016c7c7df023944f0f46d8e777d6d31f1df1764c(Extend VLA observation-to-action benchmark guidance #342, Wire the Harness loop evaluation port through Apps #462) with no conflicts. The installed checker keeps the A1 import changes and takes main's resource count 927. Wire the Harness loop evaluation port through Apps #462 adds no reference to the retired root CLI modules.mainand the A1 candidate both gave 5 passed / 3 failed, with the same three isolated-subprocess commands exceeding the existing 45 s deadline; these are attributed to local resource limits on that machine.host-compatibilityjob and are not claimed here before the run finishes. Architecture approval remains pending.